Merge remote-tracking branch 'origin/master'

srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProductArchiveController.java

@@ -60,6 +60,7 @@ public class BaseProductArchiveController extends JeecgController<BaseProductArc
                                                            HttpServletRequest req) {
         QueryWrapper<BaseProductArchive> queryWrapper = QueryGenerator.initQueryWrapper(baseProductArchive, req.getParameterMap());
         Page<BaseProductArchive> page = new Page<BaseProductArchive>(pageNo, pageSize);
+        queryWrapper.orderByDesc("create_time");
         IPage<BaseProductArchive> pageList = baseProductArchiveService.page(page, queryWrapper);
         return Result.OK(pageList);
     }

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspSupplierProfileController.java

@@ -94,6 +94,8 @@ public class CuspSupplierProfileController {
         customeRuleMap.put("temporarySupplier", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("evaluationLevel", QueryRuleEnum.LIKE_WITH_OR);
         QueryWrapper<CuspSupplierProfile> queryWrapper = QueryGenerator.initQueryWrapper(cuspSupplierProfile, req.getParameterMap(), customeRuleMap);
+
+        queryWrapper.orderByDesc("create_time");
         Page<CuspSupplierProfile> page = new Page<CuspSupplierProfile>(pageNo, pageSize);
         IPage<CuspSupplierProfile> pageList = cuspSupplierProfileService.page(page, queryWrapper);
         return Result.OK(pageList);

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryForm.java

@@ -164,6 +164,8 @@ public class PurInquiryForm implements Serializable {
     @ApiModelProperty(value = "询价备注(inquiry notes)")
     private String inquiryNotes;
 
+    //销售说明 销售询价单的备注
+    private String saleNotes;
     //来源单号（销售询价单）
     private String sourceCode;
     //来源销售询价单文件

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurInquiryFormAlert.java

@@ -131,6 +131,8 @@ public class PurInquiryFormAlert {
     @ApiModelProperty(value = "询价备注(inquiry notes)")
     private String inquiryNotes;
 
+    //销售说明 销售询价单的备注
+    private String saleNotes;
     //来源销售询价单文件
     private String saleAttachs;
 

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurInquiryFormPage.java

@@ -34,6 +34,8 @@ public class PurInquiryFormPage {
 	@ApiModelProperty(value = "创建人")
     private String createBy;
     private String sysOrgCode;
+	//销售说明 销售询价单的备注
+	private String saleNotes;
 
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")