Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionProcessVo.java

@@ -272,6 +272,8 @@ public class ProProductionSolutionProcessVo extends BaseEntity {
     private List<ProProductionSolutionProcessDrawing> drawingList=new ArrayList<>();
 
 
+    private String processRemarkNew;
+
     public ProProductionSolutionProcess getProductionSolutionProcess(ProProductionSolutionProcessVo proProductionSolutionProcessVo) {
         ProProductionSolutionProcess proProductionSolutionProcess = new ProProductionSolutionProcess();
         BeanUtils.copyProperties(proProductionSolutionProcessVo, proProductionSolutionProcess);

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionProcessMapper.xml

@@ -91,8 +91,10 @@
                ppsp.sacm_for_thermal_self_fusion,
                ppsp.sacm_for_molar_tooth,
                ppsp.sacm_for_slitting,
-               pro.process_code, pro.process_name,
+               pro.process_code,
+               pro.process_name,
                pro.process_id,
+               pro.remark as processRemarkNew,
                ppsp.unit_price,
                ppsp.direction_process_id,
                ppsp.direction_process_code,