Merge branch 'master' into wangfy-dev

wfy

2021-09-14 cd33651deff9fff7e7d9651b766210771c075190

 java110-generator/src/main/resources/newTemplate/ListCmd.txt

@@ -22,8 +22,8 @@
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.intf.dev.IBusinessTableHisV1InnerServiceSMO;
import com.java110.po.businessTableHis.BusinessTableHisPo;
import com.java110.intf.@@shareName@@.I@@TemplateCode@@V1InnerServiceSMO;
import com.java110.po.@@templateCode@@.@@TemplateCode@@Po;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -40,7 +40,7 @@

/**
 * 类表述：查询
 * 服务编码：@@templateCode@@.List@@TemplateCode@@
 * 服务编码：@@templateCode@@.list@@TemplateCode@@
 * 请求路劲：/app/@@templateCode@@.List@@TemplateCode@@
 * add by 吴学文 at @@date@@ mail: 928255095@qq.com
 * open source address: https://gitee.com/wuxw7/MicroCommunity
@@ -56,13 +56,13 @@
    private I@@TemplateCode@@V1InnerServiceSMO @@templateCode@@V1InnerServiceSMOImpl;

    @Override
    protected void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
    }

    @Override
    @Java110Transactional
    protected void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

           @@TemplateCode@@Dto @@templateCode@@Dto = BeanConvertUtil.covertBean(reqJson, @@TemplateCode@@Dto.class);