Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-07-08 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac

 HDL_ON/Common/R.cs

@@ -1397,6 +1397,8 @@
        public const int shebeibucunzai = 6092;
        public const int shebeibuzaixian = 6093;
        public const int wangguanshebeibuzaixian = 6094;
        public const int anniuchaochu30 = 6095;


        public const int newAutomation = 7000;
        public const int editAutomation = 7001;